Merge from origin/emacs-28

author Glenn Morris <rgm@gnu.org>

Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)

committer Glenn Morris <rgm@gnu.org>

Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)
author Glenn Morris <rgm@gnu.org>
Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)
committer Glenn Morris <rgm@gnu.org>
Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)
diff --cc lisp/image-dired.el
Simple merge
diff --cc src/fns.c
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 25 Oct 2021 16:34:37 +0000 (09:34 -0700)
		1	2
lisp/image-dired.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history